Remove deprecation of gtk_window_set_default_size() until patch adding

Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
	until patch adding gtk_window_set_size() is recommitted.

	* **Makefile.am configure.in gdk/x11/gdkim-11.c
	  gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
	  gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
	  (#10784)

diff --git a/ChangeLog b/ChangeLog
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 624238df19a2b96e76595aaa88bd8ff837ce707a..57bfe229bab3b9c351f3435a153bd3ab5d4fc1ec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Thu Apr 26 10:40:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.h: Remove deprecation of gtk_window_set_default_size()
+       until patch adding gtk_window_set_size() is recommitted. 
+
+       * **Makefile.am configure.in gdk/x11/gdkim-11.c
+         gtk/gtkmain.c gtk/gtkimmulticontext.c gtk/gtkmain.c
+         gtk/gtkrc.c: Remove all traces of -DX_LOCALE support.
+         (#10784)
+
 Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for 

diff --git a/configure.in b/configure.in
index 25824d6246332952a128954bc02141ea0b8dc656..15931e88964e5aa638a27e8bbeb630d142a59167 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -116,7 +116,6 @@ AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate
 AC_ARG_ENABLE(xkb, [  --enable-xkb            support XKB [default=maybe]],
                        , enable_xkb="maybe")
 AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
-AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
 
@@ -626,28 +625,6 @@ AC_SUBST(gdktargetlib)
 AC_SUBST(gtktargetlib)
 
 
-# Check if X_LOCALE definition is necessary
-
-AC_MSG_CHECKING(need -DX_LOCALE)
-
-AC_TRY_RUN([
-#include <stdio.h>
-#include <locale.h>
-
-int
-main ()
-{
-  return setlocale (LC_ALL, "${with_locale}") == NULL;
-}],
-need_x_locale=no,
-need_x_locale=yes,
-need_x_locale=no)
-AC_MSG_RESULT($need_x_locale)
-
-if test $need_x_locale = yes; then
-  GTK_LOCALE_FLAGS="-DX_LOCALE"
-fi
-
 # Checks for header files.
 AC_HEADER_STDC
 

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 8a43035b55e7bdd0dd43db1f5b587cd248767f6c..d86c8a1cc611e632dc686b674c6a93a390f7e18e 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -9,7 +9,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index b581f51e1483e0d9a718e9c3694bdcb0c1d2b4d5..e260540553da001801d80e91b081c3b0df8ce6b2 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -26,7 +26,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index dd307d3cf15c1245b0de5217cdb2b2e3cff301bc..0623527c9cf6466b3537190a683a307b934cb3a8 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -55,7 +55,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@                                 \
        -DGTK_DISABLE_COMPAT_H                          \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 3674d99f7aa609e25d6fa075af8d31916fe3442a..8d479fb0e1f56170381f2fdc9e56c6002dca471d 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -71,7 +71,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@                                 \
        -DGTK_ENABLE_BROKEN                             \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 24509b0d1ba2a6f50eb165e256a9e0de49d13a3e..0c18890e50c67643be670ec82c9cca3291e21619 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -18,7 +18,6 @@ common_includes = @STRIP_BEGIN@       \
        -I$(top_srcdir)/gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@               \
        @GTK_XIM_FLAGS@                 \
-       @GTK_LOCALE_FLAGS@              \
        @PANGO_CFLAGS@                  \
        @GLIB_CFLAGS@                   \
        @more_cflags@                   \

diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am
index 5aaf649b180ad5428a9fb49695b589cf88bf8f62..f8cd8ba798ef38778b9bca20a242fed955137a01 100644 (file)
--- a/gdk/linux-fb/Makefile.am
+++ b/gdk/linux-fb/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = @STRIP_BEGIN@      \
        @FREETYPE_CFLAGS@       \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
        @GLIB_CFLAGS@           \
        @PANGO_CFLAGS@          \
 @STRIP_END@

diff --git a/gdk/nanox/Makefile.am b/gdk/nanox/Makefile.am
index c97dc39e4c46346c7221a4eccb05cae653204bc2..043ac89a9ee5baa301e329a5110aecc2adc2b4d6 100644 (file)
--- a/gdk/nanox/Makefile.am
+++ b/gdk/nanox/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = @STRIP_BEGIN@        \
        -I$(top_srcdir)/gdk     \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
        @GLIB_CFLAGS@           \
        @more_cflags@           \
 @STRIP_END@

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index a2fc09f2973e5d6dd473d21efda65cef1b279379..79a2ce2ac4f5a8e81678cf01061cf5b708e8f6f9 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -10,7 +10,6 @@ INCLUDES = @STRIP_BEGIN@      \
        -I$(top_builddir)/gdk   \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
        @PANGO_CFLAGS@          \
        @GLIB_CFLAGS@           \
        @FREETYPE_CFLAGS@       \

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index a6ea2c01fbda59d70a75748f8205ee4ba86b165e..05fe0764c48a725d6048eb9b2b01bf3faad483b3 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <X11/Xlocale.h>
+#include <locale.h>
 
 #include "gdk.h"               /* For gdk_flush() */
 #include "gdkpixmap.h"

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8e15fb52d09ff72dd4a1c4399e5da1899f6b216f..18ba9b231fd684612ab60877666a58ca1ee4b269 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -18,7 +18,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 341b56a02dbb29b948bcfe2f964bb9896d2783e5..186dc503f606d38b803059d2d3a2cc9587c2466b 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -18,12 +18,7 @@
  */
 
 #include <string.h>
-
-#ifdef GDK_WINDOWING_X11
-#include <X11/Xlocale.h>       /* so we get the right setlocale */
-#else
 #include <locale.h>
-#endif
 
 #include "gtksignal.h"
 #include "gtkimmulticontext.h"

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index a2f1e6d4bf5bf81683ddbaf835025c00e75cb6ef..5fd4d9c7790616d80367d0bf9afae8d1577f7572 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -26,11 +26,7 @@
 
 #include "gdkconfig.h"
 
-#ifdef GDK_WINDOWING_X11
-#include <X11/Xlocale.h>       /* so we get the right setlocale */
-#else
 #include <locale.h>
-#endif
 
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
 #include <libintl.h>

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 10544dc97eeb51c5be3939b65a39ecf82513fad2..1788730e449336ef4af1fa03b13209ae1304605b 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -26,11 +26,7 @@
 
 #include "config.h"
 
-#ifdef GDK_WINDOWING_X11
-#include <X11/Xlocale.h>       /* so we get the right setlocale */
-#else
 #include <locale.h>
-#endif
 #include <ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 45dc2c5a02052e5f41272659f8416ac8babbbf56..7cbc19a512c36f1863ce220af49a6b34030913c7 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -216,6 +216,7 @@ void       gtk_window_set_policy               (GtkWindow           *window,
                                                gint                 allow_shrink,
                                                gint                 allow_grow,
                                                gint                 auto_shrink);
+#endif
 /* The following differs from gtk_widget_set_usize, in that
  * gtk_widget_set_usize() overrides the requisition, so sets a minimum
  * size, while this only sets the size requested from the WM.
@@ -223,7 +224,6 @@ void       gtk_window_set_policy               (GtkWindow           *window,
 void       gtk_window_set_default_size         (GtkWindow           *window,
                                                gint                 width,
                                                gint                 height);
-#endif
 
 /* --- internal functions --- */
 void       gtk_window_set_focus                (GtkWindow           *window,

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 0cd34e963e4da2113e4e5000bac1b55069798abe..9d3b59aa7567217c8a5de87527be0d294566fdc9 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80f1fbbee13816247a17a012f12bb090efb50795..2079d9ae894e31373551bd5dc1edfc7bf2c15b4c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -DGTK_DISABLE_COMPAT_H                          \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \